Merge lp:~openerp-dev/openobject-addons/6.0-opw-50926-vat_declaration-mtr into lp:openobject-addons/6.0

[Meera Trambadia (OpenERP)]

l10n_be:-Improved the 'Peridical VAT declaration' wizard as per the new VAT format

[lp:~openerp-dev/openobject-addons/6.0-opw-50926-vat_declaration-mtr]

5031. By Olivier Laurent (Open ERP) on 2012-02-02

[FIX] opw 50985

5032. By Olivier Laurent (Open ERP) on 2012-02-02

[FIX] opw 50985

5033. By Launchpad Translations on behalf of openerp on 2012-02-03

Launchpad automatic translations update.

5034. By Launchpad Translations on behalf of openerp on 2012-02-04

Launchpad automatic translations update.

5035. By Launchpad Translations on behalf of openerp on 2012-02-05

Launchpad automatic translations update.

5036. By Launchpad Translations on behalf of openerp on 2012-02-06

Launchpad automatic translations update.

5037. By tfr (Openerp) on 2012-02-06

[FIX] use employee id to lookup into the user table, now use the corresponding user_id

5038. By Launchpad Translations on behalf of openerp on 2012-02-07

Launchpad automatic translations update.

5040. By Launchpad Translations on behalf of openerp on 2012-02-08

Launchpad automatic translations update.

5041. By nel on 2012-02-08

[MERGE]

5042. By Launchpad Translations on behalf of openerp on 2012-02-09

Launchpad automatic translations update.

5043. By Stephane Wirtel (OpenERP) on 2012-02-09

[FIX] web_uservoice: Fix the reference about the translation

5044. By Launchpad Translations on behalf of openerp on 2012-02-10

Launchpad automatic translations update.

5045. By Olivier Laurent (Open ERP) on 2012-02-10

[FIX] opw 382100

5046. By tfr (Openerp) on 2012-02-10

[MERGE] opw 18200 : don't erase unit price when erasing the product in invoice line

5047. By Launchpad Translations on behalf of openerp on 2012-02-11

Launchpad automatic translations update.

5048. By Launchpad Translations on behalf of openerp on 2012-02-12

Launchpad automatic translations update.

5049. By Launchpad Translations on behalf of openerp on 2012-02-13

Launchpad automatic translations update.

5050. By tfr (Openerp) on 2012-02-13

[FIX] OPW 17161 : don't use the same relational field for two different osv_memory, avoid to mess up 'foreign key'

5051. By tfr (Openerp) on 2012-02-13

[REVERT] 5050

5052. By tfr (Openerp) on 2012-02-13

[FIX] mess up relation filled in picking wizard + solve key error 'wizard_pick_id', this error is due to the implementation of the read for one2many field in osv_memory, if a field in osv_memory is never written, the key is not present in the dict (representation of osv_memory) then we get the error key Error,
the workarount is defining default value for missing key (fields) in the osv_memory during the read, the correct fix should be done in the orm

5053. By nel on 2012-02-13

[MERGE]

5054. By nel on 2012-02-13

[MERGE]

5055. By Launchpad Translations on behalf of openerp on 2012-02-14

Launchpad automatic translations update.

5056. By Olivier Laurent (Open ERP) on 2012-02-14

[FIX] fix needed for opw 51206. Is linked to a server fix for csv import

5057. By Launchpad Translations on behalf of openerp on 2012-02-15

Launchpad automatic translations update.

5058. By Launchpad Translations on behalf of openerp on 2012-02-16

Launchpad automatic translations update.

5059. By nel on 2012-02-16

[MERGE]

5060. By Xavier ALT on 2012-02-16

[MERGE] OPW 18497

5061. By Xavier ALT on 2012-02-16

[MERGE] OPW 383649

5062. By Launchpad Translations on behalf of openerp on 2012-02-17

Launchpad automatic translations update.

5063. By Olivier Laurent (Open ERP) on 2012-02-17

[FIX] revert revision 5007 (for opw 57602): caused a crash (bool object has not attribute product_id)

5064. By Launchpad Translations on behalf of openerp on 2012-02-18

Launchpad automatic translations update.

5065. By Launchpad Translations on behalf of openerp on 2012-02-19

Launchpad automatic translations update.

5066. By Launchpad Translations on behalf of openerp on 2012-02-20

Launchpad automatic translations update.

5067. By nel on 2012-02-20

[MERGE]

5068. By nel on 2012-02-20

[MERGE]

5069. By Launchpad Translations on behalf of openerp on 2012-02-21

Launchpad automatic translations update.

5070. By Kirti Savalia(OpenERP) on 2012-02-08

[FIX]:when delete the analytic account at that time raise the warning message

5071. By Kirti Savalia(OpenERP) on 2012-02-15

[IMP]:use the appropriate variable name

5072. By Jean-Christophe VASSORT on 2012-02-21

[MERGE] opw 383657: hr_expense: When unit quantity or factor value is zero > get divide by zero error

5073. By Xavier ALT on 2012-02-21

[MERGE] bug 928899

5074. By Xavier ALT on 2012-02-21

[MERGE] OPW 381792

5075. By Xavier ALT on 2012-02-21

[MERGE] OPW 382010 (1st part)

5076. By Xavier ALT on 2012-02-21

[MERGE] OPW 381927

5077. By Xavier ALT on 2012-02-21

[MERGE] OPW 50766

5078. By Xavier ALT on 2012-02-21

[MERGE] OPW 50804

5079. By Xavier ALT on 2012-02-21

[MERGE] OPW 18373

5081. By Xavier ALT on 2012-02-21

[FIX] hr_holidays borken test case on report generation

5082. By Xavier ALT on 2012-02-21

[MERGE] OPW 52676

5083. By Xavier ALT on 2012-02-21

[MERGE] OPW 51172

5084. By Jean-Christophe VASSORT on 2012-02-21

[MERGE] OPW 20038 account:[FIX] : Bold text in Balance Sheet Report

In Balance Sheet report of Account module, The Font display in Bold and Normal mode seems to be incorrect in both landscape and normal view.

5085. By Jean-Christophe VASSORT on 2012-02-21

[MERGE] opw 55403: stock wizard: Precision of Average Unit Cost in Picking Processing

5086. By Jean-Christophe VASSORT on 2012-02-21

[MERGE] opw 51169

5087. By Xavier ALT on 2012-02-21

[REVERT] revert r5086, broke sale tests

5088. By Launchpad Translations on behalf of openerp on 2012-02-22

Launchpad automatic translations update.

5089. By Launchpad Translations on behalf of openerp on 2012-02-23

Launchpad automatic translations update.

5090. By Launchpad Translations on behalf of openerp on 2012-02-24

Launchpad automatic translations update.

5091. By Jean-Christophe VASSORT on 2012-02-24

[MERGE] OPW 17833: System does not take into account the currency of the pricelist if base price is 'Partner section in product form'

5092. By Jean-Christophe VASSORT on 2012-02-24

[MERGE] OPW 18123

5093. By Xavier ALT on 2012-02-24

[MERGE] OPW 57602

5094. By Xavier ALT on 2012-02-24

[MERGE] OPW 383510

5095. By Xavier ALT on 2012-02-24

[MERGE] resubmit OPW 383649

5096. By Launchpad Translations on behalf of openerp on 2012-02-25

Launchpad automatic translations update.

5097. By Launchpad Translations on behalf of openerp on 2012-02-26

Launchpad automatic translations update.

5098. By Launchpad Translations on behalf of openerp on 2012-02-27

Launchpad automatic translations update.

5099. By Launchpad Translations on behalf of openerp on 2012-02-28

Launchpad automatic translations update.

5100. By Launchpad Translations on behalf of openerp on 2012-02-29

Launchpad automatic translations update.

5101. By Launchpad Translations on behalf of openerp on 2012-03-01

Launchpad automatic translations update.

5102. By Launchpad Translations on behalf of openerp on 2012-03-02

Launchpad automatic translations update.

5103. By Xavier ALT on 2012-03-02

[MERGE] OPW 381937 - stock: product valuation having a price of 0 should be 0, not 1

5104. By Xavier ALT on 2012-03-02

[MERGE] OPW 381848 - search_default filter not working for purchase requisition

5105. By Jean-Christophe VASSORT on 2012-03-02

[MERGE] OPW 50627 Issue with act_window

related to this bug: https://bugs.launchpad.net/openobject-addons/+bug/708467

To reproduce the issue:

1 Create a new database with demo and sale module
2. Open Menu Sale/Address Book/Customers
3. Search Agrolait and open it
4. Click on Sales (link)
5. You must see 2 sales
6. Create new sale order
7. The customer field is empty (should have Agrolait)

This happens with all act_windows.

5106. By Xavier ALT on 2012-03-06

[MERGE] OPW 16328 - do not request write off when generating fy opening entries

5107. By Xavier ALT on 2012-03-06

[MERGE] OPW 382063 - account fiscal year closing: fix default date in opening entries

5108. By Xavier ALT on 2012-03-06

[MERGE] OPW 279130 - translate errors raised inside product_id_change (sale/purchase) dep. on user lang., not partner lang.

5109. By Xavier ALT on 2012-03-06

[MERGE] OPW 51075 - account.move.line: reconcile_partial() error msg when lines are already reconciled

5110. By Xavier ALT on 2012-03-06

[MERGE] OPW 51189 - on invoice 'refund', keep original salesman and fiscal position

5111. By Xavier ALT on 2012-03-06

[MERGE] OPW 18001: do not lock-out user when payment.order is 'done', allow it to cancel it

  - When 'Payment Order' is in 'done' state, the workflow is frozen and the
    user is unable to cancel it (required in case bank refuse the payment).
    This allow to cancel the payment order except when some lines are already
    imported in a bank statement (i.e payment done bank-side: modification
    forbidden).

5112. By Xavier ALT on 2012-03-06

[MERGE] OPW 18001: l10n_ch: create_date wizard was not saving file inside wizard

5113. By Xavier ALT on 2012-03-06

[MERGE] OPW 381524 - on picking invoicing, do not invoice scrapped products

5114. By Launchpad Translations on behalf of openerp on 2012-03-07

Launchpad automatic translations update.

5115. By Amit Dodiya (OpenERP) on 2012-03-07

[BACKPORT] l10n_be: backported from trunk-l10n_be-periodical-vat-declaration-bde for 'Periodical VAT declaration' wizard

Unmerged revisions

5115. By Amit Dodiya (OpenERP) on 2012-03-07

[BACKPORT] l10n_be: backported from trunk-l10n_be-periodical-vat-declaration-bde for 'Periodical VAT declaration' wizard

=== modified file 'l10n_be/company.py'
--- l10n_be/company.py	2011-01-14 00:11:01 +0000
+++ l10n_be/company.py	2012-03-07 13:19:30 +0000
@@ -25,7 +25,7 @@
     _description = 'Company'
 
     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 ""
@@ -36,7 +36,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/l10n_be_account_vat_declaration.py'
--- l10n_be/wizard/l10n_be_account_vat_declaration.py	2011-01-14 00:11:01 +0000
+++ l10n_be/wizard/l10n_be_account_vat_declaration.py	2012-03-07 13:19:30 +0000
@@ -36,17 +36,29 @@
     _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)]),
+        'tax_code_id': fields.many2one('account.tax.code', 'Tax Code', domain=[('parent_id', '=', False)], help="Keep empty to use the user's company"),
         'msg': fields.text('File created', size=64, readonly=True),
         'file_save': fields.binary('Save File'),
-        'ask_resitution': fields.boolean('Ask Restitution',help='It indicates whether a resitution is to made or not?'),
+        'ask_restitution': fields.boolean('Ask Restitution',help='It indicates whether a resitution is to made or not?'),
         'ask_payment': fields.boolean('Ask Payment',help='It indicates whether a payment is to made or not?'),
-        'client_nihil': fields.boolean('Last Declaration of Enterprise',help='Tick this case only if it concerns only the last statement on the civil or cessation of activity'),
+        'client_nihil': fields.boolean('Last Declaration, no clients in client listing',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': fields.text('Comments'),
+
     }
+    
+    def _get_tax_code(self, cr, uid, 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',
+        'tax_code_id': _get_tax_code,
     }
 
     def create_xml(self, cr, uid, ids, context=None):
@@ -58,7 +70,7 @@
         if context is None:
             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']
         data_tax = self.browse(cr, uid, ids[0])
         if data_tax.tax_code_id:
             obj_company = data_tax.tax_code_id.company_id
@@ -67,6 +79,8 @@
         vat_no = obj_company.partner_id.vat
         if not vat_no:
             raise osv.except_osv(_('Data Insufficient'), _('No VAT Number Associated with Main Company!'))
+        vat_no = vat_no.replace(' ','').upper()
+        vat = vat_no[2:]
 
         tax_code_ids = obj_tax_code.search(cr, uid, [], context=context)
         ctx = context.copy()
@@ -74,41 +88,104 @@
         ctx['period_id'] = data['period_id'] #added context here
         tax_info = obj_tax_code.read(cr, uid, tax_code_ids, ['code','sum_period'], context=ctx)
 
-        address = post_code = city = country_code = ''
-        city, post_code, address, country_code = self.pool.get('res.company')._get_default_ad(obj_company.partner_id.address)
+        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'], 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])
-        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>'+((vat_no and str(vat_no[2:])) or '')+'</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)
+
+        if not email:
+            raise osv.except_osv(_('Data Insufficient!'),_('No email address associated with the company.'))
+        if not phone:
+            raise osv.except_osv(_('Data Insufficient!'),_('No phone associated with the company.'))
+
+        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.replace('.','').replace('/','').replace('(','').replace(')','').replace(' ',''),
+                        'send_ref': send_ref,
+                        'quarter': quarter,
+                        'month': starting_month,
+                        'year': str(account_period.date_stop[: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'),
+                        '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['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(round(item['sum_period']*100)))) +  '</D'+str(int(item['code'])) +'>'
-
-        data_of_file += '\n\t\t\t</DATA_ELEM>\n\t\t</DATA>\n\t</VATRECORD>\n</VATSENDING>'
+                    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<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)
+        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']
         context['file_save'] = data_of_file

=== modified file 'l10n_be/wizard/l10n_be_account_vat_declaration_view.xml'
--- l10n_be/wizard/l10n_be_account_vat_declaration_view.xml	2011-01-14 00:11:01 +0000
+++ l10n_be/wizard/l10n_be_account_vat_declaration_view.xml	2012-03-07 13:19:30 +0000
@@ -2,55 +2,57 @@
 <openerp>
     <data>
 
-    	<menuitem
-        id="menu_finance_belgian_statement"
-        name="Belgium Statements"
-        parent="account.menu_finance_legal_statement" groups="account.group_account_manager"/>
+		<menuitem
+			id="menu_finance_belgian_statement"
+			name="Belgium Statements"
+			parent="account.menu_finance_legal_statement" groups="account.group_account_manager"/>
 
-    	<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"/><newline/>
-    						<field name="period_id" widget="selection"/>
-							<field name="tax_code_id" string="Company" widget="selection" groups="base.group_multi_company"/>
-							<newline/>
-						</group>
-						<group>
-							<field name="ask_resitution" colspan="1"/>
-							<field name="ask_payment" colspan="1"/>
-							<field name="client_nihil" string="Is Last Declaration" colspan="1" /><label/>
-	            		</group>
-	            		<newline/>
-					<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="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_save" model="ir.ui.view">
-            <field name="name">Save XML</field>
-            <field name="model">l1on_be.vat.declaration</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
+			<field name="name">Save XML</field>
+			<field name="model">l1on_be.vat.declaration</field>
+			<field name="type">form</field>
+			<field name="arch" type="xml">
 				<form string="Save xml">
 					<group colspan="3">
 						<label string="Save the File with '.xml' extension." colspan="2" align="0.0"/><newline/>
-							<field name="name"/><newline/>
-			    			<field name="file_save" readonly="True"/>
-              		<newline/>
-		      		<separator colspan="4"/><label/>
-          				<button special="cancel" string="Ok" icon="gtk-ok"/>
-      				</group>
+						<field name="name"/><newline/>
+						<field name="file_save" readonly="True"/>
+						<newline/>
+						<separator colspan="4"/><label/>
+						<button special="cancel" string="Ok" icon="gtk-ok"/>
+					</group>
 				</form>
 			</field>
 		</record>