[MERGE] merged the branch with adaptation of vat declaration wizard (l10n_be module) to intervat 8.0

bzr revid: qdp-launchpad@openerp.com-20120210101003-0zgb0taxhs0jz0bj
This commit is contained in:
Quentin (OpenERP) 2012-02-10 11:10:03 +01:00
commit a72154267a
3 changed files with 160 additions and 73 deletions

View File

@ -25,7 +25,7 @@ class res_company(osv.osv):
_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 @@ class res_company(osv.osv):
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:

View File

@ -42,17 +42,32 @@ 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)]),
'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?'),
'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'),
'vat_declarations_nbr': fields.integer('VAT Declaration Number', help="Number of periodic VAT returns in the shipment"),
'comments': fields.text('Comments'),
'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(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',
'identification_type': 'nvat',
'vat_declarations_nbr': 1,
'tax_code_id': _get_tax_code,
}
def create_xml(self, cr, uid, ids, context=None):
@ -74,44 +89,99 @@ class l10n_be_vat_declaration(osv.osv_memory):
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)
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
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'][0], context=context)
issued_by = vat_no[:2]
comments = data['comments'] or ''
type = data['identification_type'] or ''
other = data['other'] 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 = {
'vat_declarations_nbr': str(data['vat_declarations_nbr']),
'type': type.upper(),
'issued_by': issued_by,
'other': other,
'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="%(type)s" issuedBy="%(issued_by)s" otherQlf="%(other)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'
data_of_file += '\t\t<ASK RESTITUTION="' + (data['ask_restitution'] and 'YES' or 'NO') + '" PAYMENT="' + (data['ask_payment'] and 'YES' or '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'] and item['sum_period']:
if item['code'] == 'VI':
if item['sum_period'] >= 0:
item['code'] = '71'
@ -121,9 +191,17 @@ class l10n_be_vat_declaration(osv.osv_memory):
cases_list.append(item)
cases_list.sort()
for item in cases_list:
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>'
grid_amount_data = {
'code': str(int(item['code'])),
'amount': str(abs(item['sum_period'])),
}
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

View File

@ -2,60 +2,66 @@
<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">
<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_restitution" 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>
<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/>
<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" 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>
<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" filename="name"/>
<newline/>
<separator colspan="4"/><label/>
<button special="cancel" string="Ok" icon="gtk-ok"/>
</group>
</form>
</field>
</record>
<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" filename="name"/>
<newline/>
<separator colspan="4"/><label/>
<button special="cancel" string="Ok" icon="gtk-ok"/>
</group>
</form>
</field>
</record>
<record id="action_vat_declaration" model="ir.actions.act_window">
<record id="action_vat_declaration" model="ir.actions.act_window">
<field name="name">Vat Declaraion</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">l1on_be.vat.declaration</field>
@ -63,13 +69,13 @@
<field name="view_mode">form</field>
<field name="view_id" ref="view_vat_declaration"/>
<field name="target">new</field>
</record>
</record>
<menuitem
name="Periodical VAT Declaration"
parent="menu_finance_belgian_statement"
action="action_vat_declaration"
id="l10_be_vat_declaration"
<menuitem
name="Periodical VAT Declaration"
parent="menu_finance_belgian_statement"
action="action_vat_declaration"
id="l10_be_vat_declaration"
groups="account.group_account_manager"/>
</data>