Odoo Addons (MOVED TO GITHUB)

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

  1. 5.0-opw-50926-ado
  2. Merge into 5.0
Proposed by Amit Dodiya (OpenERP)
Status: Merged
Merged at revision: 2931
Proposed branch: lp:~openerp-dev/openobject-addons/5.0-opw-50926-ado
Merge into: lp:openobject-addons/5.0
Diff against target: 61 lines (+17/-6)
1 file modified
l10n_be/wizard/partner_vat_listing.py (+17/-6)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/5.0-opw-50926-ado
Reviewer Review Type Date Requested Status
nel Pending
Xavier ALT Pending
Naresh(OpenERP) Pending
Review via email: mp+95138@code.launchpad.net

Description of the change

Hello,

VAT Listing is on Fiscal year (from 1/1/2011 to 31/12/2011) ,It's not possible to work on a calendar year and this is a legal issue.

Thanks,
Amit

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_be/wizard/partner_vat_listing.py'
2--- l10n_be/wizard/partner_vat_listing.py 2010-08-23 13:55:19 +0000
3+++ l10n_be/wizard/partner_vat_listing.py 2012-02-29 12:14:22 +0000
4@@ -31,7 +31,9 @@
5 <form string="Select Fiscal Year">
6 <label string="This wizard will create an XML file for Vat details and total invoiced amounts per partner." colspan="4"/>
7 <newline/>
8- <field name="fyear" />
9+ <field name="date_start" default_focus="1"/>
10+ <newline/>
11+ <field name="date_stop"/>
12 <newline/>
13 <field name="mand_id" help="Should be provided when subscription of INTERVAT service is done"/>
14 <newline/>
15@@ -41,7 +43,8 @@
16 </form>"""
17
18 fields = {
19- 'fyear': {'string': 'Fiscal Year', 'type': 'many2one', 'relation': 'account.fiscalyear', 'required': True,},
20+ 'date_start': {'string':"Start date",'type':'date','required':True ,'default': lambda *a: time.strftime('%Y-01-01')},
21+ 'date_stop': {'string':"End date",'type':'date','required':True, 'default': lambda *a: time.strftime('%Y-12-31')},
22 'mand_id':{'string':'MandataireId','type':'char','size':'30','required': True,},
23 'limit_amount':{'string':'Limit Amount','type':'integer','required': True, },
24 'test_xml': {'string':'Test XML file', 'type':'boolean', },
25@@ -77,9 +80,12 @@
26 p_id_list = pooler.get_pool(cr.dbname).get('res.partner').search(cr,uid,[('vat_subjected','!=',False)])
27
28 if not p_id_list:
29- raise wizard.except_wizard(_('Data Insufficient!'),_('No partner has a VAT Number asociated with him.'))
30- obj_year=pooler.get_pool(cr.dbname).get('account.fiscalyear').browse(cr,uid,data['form']['fyear'])
31- period_ids = pooler.get_pool(cr.dbname).get('account.period').search(cr, uid, [('fiscalyear_id', '=', data['form']['fyear'])])
32+ raise wizard.except_wizard(_('Data Insufficient!'),_('No partner has a VAT Number associated with him.'))
33+ domains = [('date_start','>=',data['form']['date_start']),('date_stop','<=',data['form']['date_stop'])]
34+ date_stop = data['form']['date_stop']
35+ period_ids = pooler.get_pool(cr.dbname).get('account.period').search(cr, uid, domains)
36+ if not period_ids:
37+ raise wizard.except_wizard(_('Warning !'), _('Please select the proper Start date and End Date'))
38 period = "("+','.join(map(lambda x: str(x), period_ids)) +")"
39
40 street = zip_city = country = ''
41@@ -107,7 +113,7 @@
42 data_file += '\n<AgentRepr DecNumber="1">\n\t<CompanyInfo>\n\t\t<VATNum>'+str(company_vat)+'</VATNum>\n\t\t<Name>'+ comp_name +'</Name>\n\t\t<Street>'+ street +'</Street>\n\t\t<CityAndZipCode>'+ zip_city +'</CityAndZipCode>'
43 data_file += '\n\t\t<Country>'+ country +'</Country>\n\t</CompanyInfo>\n</AgentRepr>'
44 data_comp = '\n<CompanyInfo>\n\t<VATNum>'+str(company_vat)+'</VATNum>\n\t<Name>'+ comp_name +'</Name>\n\t<Street>'+ street +'</Street>\n\t<CityAndZipCode>'+ zip_city +'</CityAndZipCode>\n\t<Country>'+ country +'</Country>\n</CompanyInfo>'
45- data_period = '\n<Period>'+ obj_year.date_stop[:4] +'</Period>'
46+ data_period = '\n<Period>'+ date_stop[:4] +'</Period>'
47 error_message = []
48
49 for p_id in p_id_list:
50@@ -173,6 +179,11 @@
51 seq +=1
52 sum_tax +=line['amount']
53 sum_turnover +=line['turnover']
54+ if not line['vat']:
55+ raise wizard.except_wizard(_('Warning !'), _("Missing VAT ,Partner %s does not have a vat number") % line['name'])
56+ if not line['country']:
57+ raise wizard.except_wizard(_('Warning !'), _("Missing Country ,Partner %s does not have a country") % line['name'])
58+
59 data_clientinfo +='\n<ClientList SequenceNum="'+str(seq)+'">\n\t<CompanyInfo>\n\t\t<VATNum>'+line['vat'] +'</VATNum>\n\t\t<Country>'+tools.ustr(line['country']) +'</Country>\n\t</CompanyInfo>\n\t<Amount>'+str(int(line['amount'] * 100)) +'</Amount>\n\t<TurnOver>'+str(int(line['turnover'] * 100)) +'</TurnOver>\n</ClientList>'
60
61 data_decl ='\n<DeclarantList SequenceNum="1" DeclarantNum="'+ dnum + '" ClientNbr="'+ str(seq) +'" TurnOverSum="'+ str(int(sum_turnover * 100)) +'" TaxSum="'+ str(int(sum_tax * 100)) +'" />'